allied-creation / allied-creation-gateway · 提交

转到一个项目

作者 陈志颖
提交 a9a6dc612486cf101bc08b1e0920a517429c123b 2 个父辈 eda553eb 3d753c12

合并分支 'dev' 到 'test' 

fix:订单、退货单导入必填项修改



查看合并请求 !3
内嵌 并排对比
正在显示 1 个修改的文件 包含 2 行增加 和 2 行删除
@@ -155,7 +155,7 @@ func importDividendsOrder(controller ExcelDataController) { @@ -155,7 +155,7 @@ func importDividendsOrder(controller ExcelDataController) {
155 {EnName: "DividendsCustomerName", CnName: "*客户名称"}, 155 {EnName: "DividendsCustomerName", CnName: "*客户名称"},
156 {EnName: "OrderGoodName", CnName: "*产品名称"}, 156 {EnName: "OrderGoodName", CnName: "*产品名称"},
157 {EnName: "OrderTime", CnName: "*订单日期"}, 157 {EnName: "OrderTime", CnName: "*订单日期"},
158 - {EnName: "RegionName", CnName: "订单区域"}, 158 + {EnName: "RegionName", CnName: "*订单区域"},
159 {EnName: "OrderGoodQuantity", CnName: "*产品数量"}, 159 {EnName: "OrderGoodQuantity", CnName: "*产品数量"},
160 {EnName: "OrderGoodPrice", CnName: "*产品价格"}, 160 {EnName: "OrderGoodPrice", CnName: "*产品价格"},
161 {EnName: "Expense", CnName: "费用"}, 161 {EnName: "Expense", CnName: "费用"},
@@ -219,7 +219,7 @@ func importDividendsReturnedOrder(controller ExcelDataController) { @@ -219,7 +219,7 @@ func importDividendsReturnedOrder(controller ExcelDataController) {
219 {EnName: "OrderGoodName", CnName: "*产品名称"}, 219 {EnName: "OrderGoodName", CnName: "*产品名称"},
220 {EnName: "DividendsReturnedDate", CnName: "*退货日期"}, 220 {EnName: "DividendsReturnedDate", CnName: "*退货日期"},
221 {EnName: "OrderTime", CnName: "*订单日期"}, 221 {EnName: "OrderTime", CnName: "*订单日期"},
222 - {EnName: "RegionName", CnName: "退货区域"}, 222 + {EnName: "RegionName", CnName: "*退货区域"},
223 {EnName: "OrderGoodQuantity", CnName: "*退货数量"}, 223 {EnName: "OrderGoodQuantity", CnName: "*退货数量"},
224 {EnName: "OrderGoodPrice", CnName: "*退货价格"}, 224 {EnName: "OrderGoodPrice", CnName: "*退货价格"},
225 {EnName: "CooperationContractNumber", CnName: "*项目合约编号"}, 225 {EnName: "CooperationContractNumber", CnName: "*项目合约编号"},