diff --git a/api-admin/src/main/resources/application.properties b/api-admin/src/main/resources/application.properties index cb3acd2..e487e91 100644 --- a/api-admin/src/main/resources/application.properties +++ b/api-admin/src/main/resources/application.properties @@ -1,4 +1,4 @@ -spring.profiles.active=test1 +spring.profiles.active=dev spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml index b202426..1c5dc59 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -34,7 +34,7 @@ receiveStatus, erpFk, stockCheckFk, customerId, supId, exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser, outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode, - fromSubInvCode, createTime,invStorageCode,deptCode,printRemark) + fromSubInvCode, createTime, invStorageCode, deptCode, printRemark) values (#{id}, #{action}, #{corpOrderId}, @@ -54,7 +54,8 @@ #{stockCheckFk}, #{customerId}, #{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo}, #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, #{preCheck}, - #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime},#{invStorageCode}, #{deptCode}) + #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, #{invStorageCode}, + #{deptCode}, #{printRemark}) @@ -100,8 +101,10 @@ #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, - #{createTime},#{invStorageCode}, - #{deptCode}, #{printRemark} + #{createTime}, + #{invStorageCode}, + #{deptCode}, + #{printRemark} )