Skip to content

A
amos-boot-biz
Switch branch/tag
  1. 16 Mar, 2023 9 commits
    • zhangyingbin's avatar
      新增项目详情公共接口 · c5918493
      zhangyingbin authored
      c5918493
    • 吴江's avatar
      Merge branch 'fb_jxiop_V1.0.0_230202' into 'developer' · a47f6110
      吴江 authored 
      Fb jxiop v1.0.0 230202

See merge request !14
      a47f6110
    • 吴江's avatar
      Merge branch 'developer' into 'fb_jxiop_V1.0.0_230202' · 51cb42d5
      吴江 authored 
      # Conflicts:
#   amos-boot-biz-common/.factorypath
#   amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java
#   amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/DataDictionaryController.java
#   amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/interceptors/PermissionInterceptor.java
#   amos-boot-core/.factorypath
#   amos-boot-data/amos-boot-data-common/.factorypath
#   amos-boot-data/amos-boot-data-openapi/.factorypath
#   amos-boot-module/amos-boot-cloud-gateway/.factorypath
#   amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/DynamicFormInstanceMapper.java
#   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/resources/mapper/DynamicFormInstanceMapper.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-system-ccs/.factorypath
#   amos-boot-system-equip/.factorypath
#   amos-boot-system-fas/.factorypath
#   amos-boot-system-jcs/.factorypath
#   amos-boot-system-knowledgebase/.factorypath
#   amos-boot-system-latentdanger/.factorypath
#   amos-boot-system-maintenance/.factorypath
#   amos-boot-system-patrol/.factorypath
#   amos-boot-system-supervision/.factorypath
#   amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/feign/IdxFeignService.java
#   amos-boot-utils/amos-boot-utils-jpush/.factorypath
#   amos-boot-utils/amos-boot-utils-speech/.factorypath
#   amos-boot-utils/amos-boot-utils-video/.factorypath
      51cb42d5
    • lisong's avatar
      更新 · 3efc655a
      lisong authored
      3efc655a
    • 曹盼盼's avatar
      Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer · b7914cc7
      曹盼盼 authored
      b7914cc7
    • 曹盼盼's avatar
      修改设备认领和设备管理接口 · 09d14e18
      曹盼盼 authored
      09d14e18
    • zhangyingbin's avatar
      Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer · a9a15a0c
      zhangyingbin authored
      a9a15a0c
    • zhangyingbin's avatar
      修改监检部门、监检员选择接口 · 59fe1185
      zhangyingbin authored
      59fe1185
    • zhangsen's avatar
      获取工作流流程图API · 7408439b
      zhangsen authored
      7408439b
  3. 15 Mar, 2023 10 commits
  5. 14 Mar, 2023 12 commits
  7. 13 Mar, 2023 9 commits