-
mengbali153 authored
# Conflicts: # cement-business/src/main/java/cn/wise/sc/cement/business/controller/NormProductionController.java # cement-business/src/main/java/cn/wise/sc/cement/business/controller/ReportController.java # cement-business/src/main/java/cn/wise/sc/cement/business/controller/WeiXinController.java # cement-business/src/main/java/cn/wise/sc/cement/business/model/IndustrialReport.java # cement-business/src/main/java/cn/wise/sc/cement/business/model/SixElementReport.java # cement-business/src/main/java/cn/wise/sc/cement/business/model/query/CheckCountSampleQuery.java # cement-business/src/main/java/cn/wise/sc/cement/business/service/INormProductionService.java # cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/CommonServiceImpl.java # cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java # cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NormProductionServiceImpl.java # cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/QualityApplyServiceImpl.java # cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/WeiXinService.java # cement-business/src/main/java/cn/wise/sc/cement/business/util/CheckCountUtil.java # cement-business/src/main/java/cn/wise/sc/cement/business/util/weixin/Global.java # cement-business/src/main/java/cn/wise/sc/cement/business/util/weixin/WeixinInterfaceUtil.java
f44e6cc3
