Merge branch 'master' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/gysl into dongdingding
# Conflicts:
# ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MlController.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PlanInformationController.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyrzInformationController.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/WysmxInformationController.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmpjqdController.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmxlController.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Ml.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Pjpz.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/PlanInformation.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/QyrzInformation.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/WysmxInformation.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmpjqd.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmzsk.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationDao.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MlService.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MxService.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyrzInformationService.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmpjqdService.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmxlService.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MlServiceImpl.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyrzInformationServiceImpl.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmpjqdServiceImpl.java
# ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmxlServiceImpl.java
|
dongdingding
杜函宇
何浩玮