wr 8b1074c172 Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java

2024-07-24 09:46:55 +08:00

..

common-device-biz

1.监督计划调整

2024-06-25 13:24:40 +08:00

device-boot

切换pq终端

2024-06-24 17:44:23 +08:00

pms-device

1.监督计划调整

2024-06-25 13:24:40 +08:00

pq-device

Merge remote-tracking branch 'origin/master'

2024-07-24 09:46:55 +08:00

pom.xml

将终端台账拆分为pq&pms两类

2022-09-29 19:43:14 +08:00