Skip to content

A
amos-boot-biz
Switch branch/tag
  1. 26 Sep, 2022 1 commit
  3. 23 Sep, 2022 14 commits
    • litengwei's avatar
      冲突解决 · 78ffb2c6
      litengwei authored
      78ffb2c6
    • litengwei's avatar
      解决冲突 · d138eb15
      litengwei authored
      d138eb15
    • litengwei's avatar
      Merge branch 'develop_dl_plan6' into develop_dl_plan6_temp · 3b189119
      litengwei authored 
      # Conflicts:
#	amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/EquipmentManageVo.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.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/FirefightersServiceImpl.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentManageController.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/EquipmentManageService.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IFireFightingSystemService.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentManageServiceImpl.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java
#	amos-boot-system-equip/src/main/resources/mapper/EquipmentManageMapper.xml
      3b189119
    • litengwei's avatar
      Merge branch 'develop_dl_3.6.0.6' into develop_dl_plan6 · db52b87f
      litengwei authored 
      # Conflicts:
#	amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
      db52b87f
    • zhangsen's avatar
      系统查询修改 · 0335913e
      zhangsen authored
      0335913e
    • tianyiming's avatar
      更新liquibase · 07abcbde
      tianyiming authored
      07abcbde
    • tianyiming's avatar
      更新liquibase · 41f0efc9
      tianyiming authored
      41f0efc9
    • zhangsen's avatar
      系统查询报错 · 83266d70
      zhangsen authored
      83266d70
    • zhangsen's avatar
      缺陷所需APIxiugai · c5f9e3ec
      zhangsen authored
      c5f9e3ec
    • tianyiming's avatar
      9411 3.6 在岗人员 · 8bf45a47
      tianyiming authored
      8bf45a47
    • limei's avatar
      Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6 · f8c027c0
      limei authored
      f8c027c0
    • limei's avatar
      新增接口查询阀厅指标接口 · c9f20155
      limei authored
      c9f20155
    • KeYong's avatar
      去掉多余依赖 · 7307a975
      KeYong authored
      7307a975
    • KeYong's avatar
      Merge branch 'develop_dl_3.6.0.6' into develop_dl_plan6 · 9cdc558b
      KeYong authored 
      # Conflicts:
#	amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/OrgUsrAgencyUser.java
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrAgencyUserController.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/ApplicationRunnerImpl.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/OrgUsrAgencyUserServiceImpl.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-system-equip/src/main/resources/mapper/AnalysisReportLogMapper.xml
#	amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
#	pom.xml
      9cdc558b
  5. 22 Sep, 2022 8 commits
  7. 21 Sep, 2022 17 commits