Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/service/change.js

@@ -1316,8 +1316,8 @@ module.exports = app => {
          * @param {Number} cid - 当前变更令
          */
         async getOthersChange(tid, cid) {
-            const sql = 'SELECT * FROM ?? WHERE tid = ? AND cid != ? ORDER BY ? desc ';
-            const sqlParam = [this.tableName, tid, cid, 'in_time'];
+            const sql = 'SELECT * FROM ?? WHERE tid = ? AND cid != ? ORDER By `in_time` desc ';
+            const sqlParam = [this.tableName, tid, cid];
             const data = await this.db.query(sql, sqlParam);
             const changeClassObj = {};
             for (const c in changeConst.class) {