You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

WangQi e9977aefc8 Merge remote-tracking branch 'origin/task_4631_wq' into release ... # Conflicts: # order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java		2 years ago
..
download	Merge remote-tracking branch 'origin/task_4631_wq' into release	2 years ago
mybatis	feature：引用物料时添加特殊物料字段、生成预制是判断成品的标识bug修复	2 years ago
redinvoice	feature 1.山能订单服务代码初始化，版本：V6.1.2.5	3 years ago
banner.txt	feature 1.山能订单服务代码初始化，版本：V6.1.2.5	3 years ago
bootstrap-dev.yaml	feature：同步组织信息	2 years ago
bootstrap-pre.yaml	feature 1.合并定制化内容	2 years ago
bootstrap-preNew.yaml	feature 1.合并定制化内容	2 years ago
bootstrap-prod.yaml	feature 1.全电的数量、单价长度为13位	2 years ago
bootstrap-std.yaml	feature：nacos 配置注册的用户名密码	2 years ago
bootstrap-test.yaml	feature：测试环境配置服务发现中心账户密码	2 years ago
bootstrap.yaml	task4216 ofd转png接口使用影像系统接口 增加开关配置	2 years ago
dxhy-logback.xml	feature 1.山能订单服务代码初始化，版本：V6.1.2.5	3 years ago
generator.properties	feat: 版本迁移问题修改	2 years ago
generatorConfig.xml	feature 1.山能订单服务代码初始化，版本：V6.1.2.5	3 years ago
logback-spring.xml	feature 1.山能订单服务代码初始化，版本：V6.1.2.5	3 years ago