1. 13 Jan, 2022 9 commits
    • tangwei's avatar
      Merge branch 'developer' into develop_ccs · f68386a1
      tangwei authored
      # Conflicts:
      #	amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java
      #	amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
      #	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentSpecificController.java
      #	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificMapper.java
      #	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEquipmentSpecificSerivce.java
      #	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java
      #	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java
      #	amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java
      #	amos-boot-system-equip/src/main/resources/application-docker.properties
      #	amos-boot-system-equip/src/main/resources/application-jcs.properties
      #	amos-boot-system-equip/src/main/resources/application-qa.properties
      #	amos-boot-system-equip/src/main/resources/application-test.properties
      #	amos-boot-system-equip/src/main/resources/changelog/wl-3.0.1.xml
      #	amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml
      ---------合并dev 到css
      f68386a1
    • tianbo's avatar
    • tianbo's avatar
      bug修改 · b8531ebe
      tianbo authored
      b8531ebe
    • suhuiguang's avatar
      d7b0565f
    • suhuiguang's avatar
    • suhuiguang's avatar
      1.分类树优化 · b7fc9dc4
      suhuiguang authored
      b7fc9dc4
    • KeYong's avatar
      接口更新参数 · 268d94f5
      KeYong authored
      268d94f5
    • helinlin's avatar
    • helinlin's avatar
      修改bug · db23ae0e
      helinlin authored
      db23ae0e
  2. 12 Jan, 2022 19 commits
  3. 11 Jan, 2022 12 commits