智能平台后端
Go to file
郝彬 bd7cf2123e Merge branch 'master' into development
# Conflicts:
#	core/src/main/java/com/dite/znpt/domain/entity/EquipmentEntity.java
#	core/src/main/java/com/dite/znpt/domain/vo/ProjectTasksDetailResp.java
#	core/src/main/java/com/dite/znpt/service/impl/ProjectTaskServiceImpl.java
#	web/src/main/java/com/dite/znpt/web/controller/ProjectController.java
#	web/src/main/java/com/dite/znpt/web/controller/ProjectTaskController.java
2025-08-13 10:31:04 +08:00
core Merge branch 'master' into development 2025-08-13 10:31:04 +08:00
doc Merge remote-tracking branch 'upstream/master' 2025-08-06 16:00:53 +08:00
flowable 代码合并问题处理 2025-08-07 15:33:32 +08:00
sip 回滚sip文件 2025-08-07 15:02:35 +08:00
web 8-12 查询所有未立项合同,新增项目时可直接选择对应合同 2025-08-12 17:57:54 +08:00
.gitattributes 1.增加sip服务 2025-04-18 20:37:01 +08:00
.gitignore 忽略提交pom.xml,yaml文件,完成设备采购模块的新增和编辑功能 2025-08-07 14:35:43 +08:00
pom.xml 代码合并问题处理 2025-08-07 15:33:32 +08:00