chengjunwang 2965f39f28 Merge branch 'main-cj' ...

# Conflicts:
#	src/main/java/com/jdc/jdcproject/controller/FangpaishuiUnitController.java
#	src/main/java/com/jdc/jdcproject/mapper/FangpaishuiUnitMapper.java
#	src/main/java/com/jdc/jdcproject/mapper/xml/FangpaishuiUnitMapper.xml
#	src/main/java/com/jdc/jdcproject/service/FangpaishuiUnitService.java
#	src/main/java/com/jdc/jdcproject/service/impl/FangpaishuiUnitServiceImpl.java

2025-05-07 15:32:15 +08:00

..

VO

Merge branch 'main-cj'

2025-05-07 15:32:15 +08:00

DicekeMiningloss.java

first add

2025-04-27 16:49:30 +08:00

DicekeMiningrecord.java

first add

2025-04-27 16:49:30 +08:00

DicekePlatearea.java

first add

2025-04-27 16:49:30 +08:00

DicekePrecipitation.java

first add

2025-04-27 16:49:30 +08:00

DicekeShovel.java

修改shovel类型，新增查寻功能

2025-05-02 23:07:38 +08:00

Equipment.java

[add]新增设备管理

2025-05-06 16:11:53 +08:00

FangpaishuiPumpoperationrecord.java

[add]水泵运行日志管理

2025-05-07 15:26:24 +08:00

FangpaishuiWatertreatmentrecord.java

[add]处理水量功能新增

2025-05-06 12:44:08 +08:00

Renyuanjiegou.java

新增users登录校验锁定，解决swagger包版本依赖 冲突，增加地测科mo品味部分修改功能

2025-04-28 00:04:18 +08:00

RenyuanjiegouLaowu.java

first add

2025-04-27 16:49:30 +08:00

Users.java

新增users登录校验锁定，解决swagger包版本依赖 冲突，增加地测科mo品味部分修改功能

2025-04-28 00:04:18 +08:00