Skip to content

T
tianjin-cement
Switch branch/tag
  1. 26 Oct, 2020 6 commits
    • qinhu's avatar
      产值统计优化(减少查询;添加缓存) · 367d1858
      qinhu authored
      367d1858
    • 竹天卫's avatar
      123 · df0614f4
      竹天卫 authored
      df0614f4
    • 竹天卫's avatar
      Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/tianjin-cement · c6c4db66
      竹天卫 authored
      c6c4db66
    • 竹天卫's avatar
      未校核的 计算结果字段 返回jsonarray类型 · d1290be8
      竹天卫 authored
      d1290be8
    • mengbali153's avatar
      非标产值申请 · 13a63fe4
      mengbali153 authored
      13a63fe4
    • mengbali153's avatar
      Merge remote-tracking branch 'origin/master' into master · f44e6cc3
      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
  3. 23 Oct, 2020 7 commits
  5. 22 Oct, 2020 5 commits
  7. 21 Oct, 2020 5 commits
  9. 20 Oct, 2020 9 commits
  11. 19 Oct, 2020 6 commits
  13. 18 Oct, 2020 2 commits