Merge remote-tracking branch 'origin/orderChange' into zhairh

2 years ago · 0bde171a06
parent 03c7106035 6c7d8a142f
commit 0bde171a06
1 changed files with 1 additions and 1 deletions
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDetailDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDetailDao.xml
@ -271,7 +271,7 @@
        select ip.productsName productName,
        ip.ggxh,
        ip.batchNo,
-        ip.productionDate,
+        ip.productionDate produceDate,
        ip.expireDate,
        bp.zczbhhzbapzbh,
        bp.ylqxzcrbarmc