Merge remote-tracking branch 'origin/busUser' into busUser

api-admin/src/main/resources/application-dev.properties

@@ -1,4 +1,4 @@
-server.port=9989
+server.port=9991
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms_ph1?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root

api-admin/src/main/resources/schemas/schema_v2.1.sql

@@ -4,7 +4,7 @@ CALL Pro_Temp_ColumnWork ('io_order','wzUploadStatus','varchar(255) ', 1);
 CALL Pro_Temp_ColumnWork ('io_order','wzUploadResult','varchar(255) ', 1);
 
 CALL Pro_Temp_ColumnWork ('stock_order','noInvOut','tinyint', 1);
-CALL Pro_Temp_ColumnWork ('stock_order_detail','zczbhhzbapzbh','varchar(255)', 1);
+CALL Pro_Temp_ColumnWork ('stock_order_remak','zczbhhzbapzbh','varchar(255)', 1);
 
 
 -- 新增数据