Skip to content

A
amos-boot-biz
Switch branch/tag
  1. 01 Dec, 2022 6 commits
  3. 30 Nov, 2022 3 commits
  5. 29 Nov, 2022 4 commits
    • zhangsen's avatar
      Merge remote-tracking branch 'origin/develop_dl_plan6_temp' into develop_dl_plan6_temp · 0550cdc0
      zhangsen authored
      0550cdc0
    • zhangsen's avatar
      Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6_temp · 37678fda
      zhangsen authored 
      # Conflicts:
#	amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java
#	amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IDataSyncService.java
#	amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml
#	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-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/WaterResourceServiceImpl.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/JcsFeign.java
#	amos-boot-system-equip/src/main/resources/application-dev.properties
#	amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
#	amos-boot-system-jcs/src/main/resources/application-dev.properties
#	amos-boot-utils/amos-boot-utils-message/src/main/resources/application-dev.properties
      37678fda
    • zhangsen's avatar
      巡检相关bug xiugai · 236f2686
      zhangsen authored
      236f2686
    • tangwei's avatar
      修改人员编辑bug · 9bdfc2ab
      tangwei authored
      9bdfc2ab
  7. 28 Nov, 2022 7 commits
  9. 25 Nov, 2022 11 commits
  11. 24 Nov, 2022 6 commits
  13. 23 Nov, 2022 3 commits