Commit Graph

8 Commits

Author SHA1 Message Date
郝彬 67d943af61 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	core/src/main/java/com/dite/znpt/domain/vo/ProjectBudgetInfoImportReq.java
#	core/src/main/java/com/dite/znpt/service/impl/UserServiceImpl.java
#	core/src/main/resources/mapper/ProjectMapper.xml
#	core/src/main/resources/mapper/UserMapper.xml
#	pom.xml
#	web/src/main/java/com/dite/znpt/web/controller/VideoController.java
2025-08-06 16:00:53 +08:00
wangna0328 ade816ab3f 代码修改部分重新提交 2025-08-05 20:31:52 +08:00
wangna0328 ec5cca1dab 自动检测初步代码,还未测试 2025-08-05 11:00:08 +08:00
wangna0328 72af3aa203 增加制度类型管理页面,相关方法已通过测试 2025-07-30 16:17:42 +08:00
wangna0328 641266e549 移除讨论功能 2025-07-30 09:24:22 +08:00
wangna0328 d10cd352b0 移除制度模块中与投票相关的方法并修改相关逻辑 2025-07-29 20:11:46 +08:00
郝彬 4ac2b4314c 7-29-根据角色查询用户 2025-07-29 09:09:57 +08:00
高雄 98950780f5 1、登陆功能todo 2025-05-23 17:52:58 +08:00