Merge branch 'master' of https://gitea.anxinyun.cn/free-sun/HumanResource

api/app/lib/controllers/member/index.js

@@ -531,7 +531,7 @@ async function exportData(ctx) {
          key: 'userActiveStatus',
       }, {
          title: '绩点',
-         key: 'point',
+         key: 'gradePoint',
       }, {
          title: '归属机构',
          key: 'userOrganization',

api/app/lib/models/member.js

@@ -212,6 +212,15 @@ module.exports = dc => {
             primaryKey: false,
             field: "technical_grade",
             autoIncrement: false
+        },
+        gradePoint: {
+            type: DataTypes.STRING,
+            allowNull: true,
+            defaultValue: null,
+            comment: "绩点",
+            primaryKey: false,
+            field: "grade_point",
+            autoIncrement: false
         }
     }, {
         tableName: "member",