Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/service/deal_bills.js

@@ -56,7 +56,7 @@ module.exports = app => {
                             iQty = -1;
                         }
                     } else {
-                        const code = this.ctx.helper._.trimEnd(row[iCode]);
+                        const code = this.ctx.helper._.trim(row[iCode]);
                         console.log(code);
                         if (this.ctx.helper.validBillsCode(code)) {
                             const data = {
@@ -149,7 +149,7 @@ module.exports = app => {
                         iTp = -1;
                     }
                 } else {
-                    const code = this.ctx.helper.replaceReturn(this.ctx.helper._.trimEnd(row[iCode]));
+                    const code = this.ctx.helper.replaceReturn(this.ctx.helper._.trim(row[iCode]));
                     if (this.ctx.helper.validBillsCode(code)) {
                         const data = {
                             deal_id: bills.length + 1,