Commits · c86a3a84ba0fed763aa794466cce9e7c5aea7891 · 项目统一框架 / 一体化_户用光伏项目代码 / amos-boot-zx-biz · GitLab

01 Jul, 2024 23 commits
- Merge remote-tracking branch 'origin/developer' into developer · c86a3a84
  朱晨阳 authored Jul 01, 2024
  
  c86a3a84
- Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer · fdd96dcf
  wujiang authored Jul 01, 2024
  
  fdd96dcf
- 提交默认异常配置 · f7102990
  wujiang authored Jul 01, 2024
  
  f7102990
- 27301 经销商管理员不能对经销商账号进行删除操作 · e15a7269
  hezhuozhi authored Jul 01, 2024
  
  e15a7269
- Merge remote-tracking branch 'origin/developer' into developer · 479bdff6
  朱晨阳 authored Jul 01, 2024
  
  479bdff6
- 提交装备 · cbec0fa5
  wujiang authored Jul 01, 2024
  
  cbec0fa5
- Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer · 3dcb2b13
  wujiang authored Jul 01, 2024
  
  3dcb2b13
- 提交装备 · d85aac8d
  wujiang authored Jul 01, 2024
  
  d85aac8d
- Merge remote-tracking branch 'origin/developer' into developer · 201593bb
  朱晨阳 authored Jul 01, 2024
  
  201593bb
- Merge remote-tracking branch 'origin/developer' into developer · 1d025c1c
  chenzhao authored Jul 01, 2024
  
  1d025c1c
- Merge remote-tracking branch 'origin/developer' into developer · 514818a8
  朱晨阳 authored Jul 01, 2024
  
  514818a8
- 修复工号重复校验bug · 3a62f6f2
  chenzhao authored Jul 01, 2024
  
  3a62f6f2
- 经销商注册auth_login_info 表有数据，业务表没有数据，审核报手机号重复 · 1165f57b
  朱晨阳 authored Jul 01, 2024
  
  1165f57b
- 添加装备服务 · 8d30ebd2
  wujiang authored Jul 01, 2024
  
  8d30ebd2
- Merge remote-tracking branch 'origin/developer' into developer · 7c14ecdb
  chenzhao authored Jul 01, 2024
  
  7c14ecdb
- 修复电站管理列表历史审核状态显示不对 · 68c29b86
  chenzhao authored Jul 01, 2024
  
  68c29b86
- 修复bug 工程电话错乱bug · b5e63bd7
  chenzhao authored Jul 01, 2024
  
  b5e63bd7
- Merge remote-tracking branch 'origin/developer' into developer · 323ff25b
  朱晨阳 authored Jul 01, 2024
  
  323ff25b
- 修改预警任务一览页面待处理任务接口 · 9f5b7577
  朱晨阳 authored Jul 01, 2024
  
  9f5b7577
- 修改部盾接口 · a9691c08
  wujiang authored Jul 01, 2024
  
  a9691c08
- Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer · 5d169bb4
  wujiang authored Jul 01, 2024
  
  5d169bb4
- 提交人大金仓配置 · 9d72a439
  wujiang authored Jul 01, 2024
  
  9d72a439
- 优化经销商开发删除农户接口 · 365ecc03
  朱晨阳 authored Jul 01, 2024
  
  365ecc03
28 Jun, 2024 2 commits
- 经销商开发实现农户删除功能 · 7896cd79
  朱晨阳 authored Jun 28, 2024
  
  7896cd79
- 27236 【智慧能源一体化】大屏监控运维数据接口返回添加Key字段 · e4521a85
  hezhuozhi authored Jun 28, 2024
  
  e4521a85
27 Jun, 2024 8 commits
- 添加过滤条件 · 8fda3abf
  朱晨阳 authored Jun 27, 2024
  
  8fda3abf
- 修改经销商管理员注册时手机号和用户名校验错误 · f32380a7
  朱晨阳 authored Jun 27, 2024
  
  f32380a7
- 投融资代码bug修复 · 10db47a8
  chenzhao authored Jun 27, 2024
  
  10db47a8
- Merge remote-tracking branch 'origin/developer' into developer · 4d0095cd
  chenzhao authored Jun 27, 2024
  
  4d0095cd
- es error · b4e192dd
  chenzhao authored Jun 27, 2024
  
  b4e192dd
- 修改完工登记 · ddfac81a
  wujiang authored Jun 27, 2024
  
  ddfac81a
- 修改投融资 · e15e81d7
  chenzhao authored Jun 27, 2024
  
  e15e81d7
- 修改投融资 · 0c1a400e
  chenzhao authored Jun 27, 2024
  
  0c1a400e
26 Jun, 2024 6 commits
- 修改投融资冗余字段 · d303700e
  chenzhao authored Jun 26, 2024
  
  d303700e
- Merge remote-tracking branch 'origin/developer' into developer · 0692aac7
  chenzhao authored Jun 26, 2024
  
  0692aac7
- 批量推送支持整改待推送及审核不通过排除审核记录多次生成问题 · f47bb920
  chenzhao authored Jun 26, 2024
  
  f47bb920
- Merge remote-tracking branch 'origin/developer' into developer · 47f8ab44
  朱晨阳 authored Jun 26, 2024
```
# Conflicts:
#	amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PersonnelBusinessServiceImpl.java
```
  47f8ab44
- 经销商管理人员添加删除接口 · 6d8fc62d
  朱晨阳 authored Jun 26, 2024
  
  6d8fc62d
- 提价重复规避 · 69de4bbd
  wujiang authored Jun 26, 2024
  
  69de4bbd
25 Jun, 2024 1 commit
- 修改获取数值 · f1f231fe
  wujiang authored Jun 25, 2024
  
  f1f231fe