Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-majoys into dev

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/projectorder/ProjectOrderDO.java

@@ -206,20 +206,6 @@ public class ProjectOrderDO extends BaseDO {
      */
     private String ts;
 
-    /**
-     * 客户分订单号
-     */
-    private String pubuserdefnvc2;
-
-    /**
-     * 订单序号
-     */
-    private String priuserdefnvc2;
-
-    /**
-     * 颜色
-     */
-    private String freeItem0;
 
     /**
      * 快照原始单据日期

mes-server/src/main/resources/application-local.yaml

@@ -43,7 +43,7 @@ spring:
       primary: master
       datasource:
         master:
-          name: mes-majoys-pro-test
+          name: mes-majoys-pro
           url: jdbc:mysql://222.71.165.188:3309/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
           driver-class-name: com.mysql.jdbc.Driver
           username: root
@@ -224,4 +224,4 @@ chanjet:
     appKey: AQT9tceb #需要填写在开放平台申请的appKey
     appSecret: 30AD3E759DD15FFB1687C1B22BECF25A #需要填写在开放平台申请的appSecret
     secret: 1234567890123456 #秘钥，用于解密，需要去开放平台自主填写，然后配置在此处
-    redirectUri: http://222.71.165.187:9021/admin-api/biz/chanjet/receiveCode #Oauth重定向地址，需要去开放平台自主填写，然后配置在此处
+    redirectUri: http://222.71.165.187:9021/admin-api/biz/chanjet/receiveCode #Oauth重定向地址，需要去开放平台自主填写，然后配置在此处