21 Commits (8e815945eb16c042bd60848d8b5db60796cce1fa)

Author SHA1 Message Date
Yangwl 6fb697e5ca Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapRFW.java
#	op-auth/src/main/resources/bootstrap.yml
#	op-gateway/src/main/resources/bootstrap.yml
#	op-modules/op-mes/push-mes.bat
#	op-modules/op-mes/src/main/resources/bootstrap.yml
#	op-modules/op-sap/src/main/resources/bootstrap.yml
#	op-modules/op-system/src/main/resources/bootstrap.yml
1 year ago
Yangwl cec59e4bc4 烘房看板接口 1 year ago
zhaoxiaolin 2aa1ad4f2e bat换jdk 1 year ago
zhaoxiaolin 15157dd26e 测试版本注册中心修改 1 year ago
zhaoxiaolin 9bea4d9d6c 工单编码 1 year ago
zhaoxl ced838087d zxl 1 year ago
zhaoxiaolin ccb8a178cb 生产环境 1 year ago
ShiChangzhou 19ba5adeab 发版命令 1 year ago
zhaoxiaolin 139dc3fb4c 日生产报表功能 1 year ago
chj 9178d37581 成品生产入库 1 year ago
zhaoxiaolin d6d5ff4ae3 计划bug修改-- 计划的选择方式修改 1 year ago
chj 50fdeebd4b 成品生产入库 1 year ago
zhaoxiaolin 76036ee69a 计划bug修改 1 year ago
Yangwl 73aca5b45b Merge branch 'master' of F:\workplace-idea\榄菊\lanju-cloud with conflicts. 1 year ago
chj 0e7a206b40 MES报废功能 1 year ago
zhaoxiaolin 362f6a167b 计划涉及的接口开发 1 year ago
Yangwl 7cb2180d78 Merge branch 'master' of F:\workplace-idea\榄菊\lanju-cloud with conflicts. 1 year ago
zhaoxiaolin 974dd13455 工厂数据源切换 1 year ago
zhaoxiaolin f4f729febe init3.1 1 year ago
zhaoxiaolin 924c2c14c0 init3.0 1 year ago
zhaoxiaolin 39a6d33464 init 1 year ago