Commit Graph

22 Commits (3983470a67f938d70687cc311eeb86a08f087134)

Author SHA1 Message Date
Yangwl 01dd5b5629 本地保存
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
Yangwl cec59e4bc4 烘房看板接口
zhaoxiaolin 2aa1ad4f2e bat换jdk
zhaoxiaolin 15157dd26e 测试版本注册中心修改
zhaoxiaolin 9bea4d9d6c 工单编码
zhaoxl ced838087d zxl
zhaoxiaolin ccb8a178cb 生产环境
ShiChangzhou 19ba5adeab 发版命令
zhaoxiaolin 139dc3fb4c 日生产报表功能
chj 9178d37581 成品生产入库
zhaoxiaolin d6d5ff4ae3 计划bug修改-- 计划的选择方式修改
chj 50fdeebd4b 成品生产入库
zhaoxiaolin 76036ee69a 计划bug修改
Yangwl 73aca5b45b Merge branch 'master' of F:\workplace-idea\榄菊\lanju-cloud with conflicts.
chj 0e7a206b40 MES报废功能
zhaoxiaolin 362f6a167b 计划涉及的接口开发
Yangwl 7cb2180d78 Merge branch 'master' of F:\workplace-idea\榄菊\lanju-cloud with conflicts.
zhaoxiaolin 974dd13455 工厂数据源切换
zhaoxiaolin f4f729febe init3.1
zhaoxiaolin 924c2c14c0 init3.0
zhaoxiaolin 39a6d33464 init