diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/projectorder/ProjectOrderDO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/projectorder/ProjectOrderDO.java index 2f5d6001..f6d69f68 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/projectorder/ProjectOrderDO.java +++ b/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; /** * 快照原始单据日期 diff --git a/mes-server/src/main/resources/application-local.yaml b/mes-server/src/main/resources/application-local.yaml index 978b9b2a..a5c34699 100644 --- a/mes-server/src/main/resources/application-local.yaml +++ b/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 @@ -59,7 +59,7 @@ spring: redis: host: 222.71.165.188 # 地址 port: 6379 # 端口 - database: 4 # 数据库索引 + database: 3 # 数据库索引 password: 'qweasd,.123' # 密码,建议生产环境开启 --- #################### 定时任务相关配置 #################### @@ -221,7 +221,7 @@ chanjet: gatewayUrl: https://openapi.chanjet.com #开放平台网关地址 connectTimeout: 3000 #连接超时时间,单位ms readTimeout: 15000 #读取超时时间,单位ms - appKey: AQT9tceb #需要填写在开放平台申请的appKey - appSecret: 30AD3E759DD15FFB1687C1B22BECF25A #需要填写在开放平台申请的appSecret + appKey: 4fwVPgzS #需要填写在开放平台申请的appKey + appSecret: 10A472641CDA5FB08ABA7178B190C7C5 #需要填写在开放平台申请的appSecret secret: 1234567890123456 #秘钥,用于解密,需要去开放平台自主填写,然后配置在此处 - redirectUri: http://222.71.165.187:9021/admin-api/biz/chanjet/receiveCode #Oauth重定向地址,需要去开放平台自主填写,然后配置在此处 + redirectUri: http://222.71.165.187:9031/admin-api/biz/chanjet/receiveCode #Oauth重定向地址,需要去开放平台自主填写,然后配置在此处 \ No newline at end of file