dongdingding
|
af81be3e2f
|
Merge branch 'dongdingding' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/gysl
|
1 month ago |
|
dongdingding
|
4a897482bd
|
Merge branch 'dongdingding' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/gysl
# 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
|
1 month ago |
|
dongdingding
|
0041068fc3
|
富文本转化pdf
|
1 month ago |
|
dongdingding
|
26f6599831
|
Merge branch 'master' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/gysl into dongdingding
|
1 month ago |
|
dongdingding
|
c51fffe8e0
|
富文本转化pdf
|
1 month ago |
 杜函宇
|
92b5710a41
|
增加月度信息数据对接（未测试）
|
1 month ago |
|
杜函宇
|
2870f56859
|
bugfix
|
1 month ago |
|
杜函宇
|
c47b126c74
|
放开权限
|
1 month ago |
|
杜函宇
|
16e89b3363
|
消息通知bugfix
|
1 month ago |
|
dongdingding
|
8fdfc9e466
|
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
|
1 month ago |
|
杜函宇
|
2d7a2bfd94
|
消息通知
|
1 month ago |
|
杜函宇
|
0ee71e0920
|
增加流程
|
1 month ago |
|
杜函宇
|
4b528ea63b
|
bugfix
|
1 month ago |
|
杜函宇
|
1e3f5a682e
|
bugfix
|
1 month ago |
|
杜函宇
|
061445db0f
|
动态导出excel
|
1 month ago |
|
dongdingding
|
0b7a3d5d47
|
项目详情模块编写
|
2 months ago |
|
dongdingding
|
4524174d80
|
项目详情模块编写
|
2 months ago |
|
dongdingding
|
5845b77be9
|
Merge branch 'master' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/gysl into dongdingding
|
2 months ago |
|
dongdingding
|
5410b8f729
|
项目详情模块编写
|
2 months ago |
|
dongdingding
|
f269409945
|
项目详情模块编写
|
2 months ago |
|
dongdingding
|
6cf68df5f3
|
Merge branch 'hhw' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/gysl into dongdingding
|
2 months ago |
 何浩玮
|
66504d5c29
|
第一次提交
|
2 months ago |
|
dongdingding
|
b1bfb5563f
|
第二次提交
|
2 months ago |
|
dongdingding
|
c634ae3927
|
第一次提交
|
2 months ago |
