swspkmas.git - Gitblit

refs
author	“djh” <“3298565835@qq.com”>
	Wednesday, February 5, 2025 13:02 +0800
committer	“djh” <“3298565835@qq.com”>
	Wednesday, February 5, 2025 13:02 +0800
commit	727c30f11ede5b3c82ead6e09e5e077c0e7519f1
tree	630b739dedf47573cda7888dd30de2b64b0ad773 tree \| zip \| gz
parent	94c78c2e5f4affd2e92195d70b7576e6da24325d view \| diff 95f201010afaf1ddc4c5d17e55445476b52601bb view \| diff

Merge branch 'dev-20250116' of https://sinanoaq.cn:8888/r/swspkmas into dev-20250116

	exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/addForm/ExamSiteAddForm.java	66 ●●●●● diff \| view \| raw \| blame \| history
	exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/ExamSiteServiceImpl.java	137 ●●●●● diff \| view \| raw \| blame \| history
	exam-system/src/main/java/com/gkhy/exam/pay/controller/NonCoalPayController.java	17 ●●●●● diff \| view \| raw \| blame \| history
	exam-system/src/main/java/com/gkhy/exam/pay/dto/rep/NonCoalPayDetailH5RepDto.java	4 ●●●●● diff \| view \| raw \| blame \| history
	exam-system/src/main/java/com/gkhy/exam/pay/dto/rep/NonCoalStuRep.java	8 ●●●●● diff \| view \| raw \| blame \| history
	exam-system/src/main/java/com/gkhy/exam/pay/entity/NonCoalPayStudent.java	14 ●●●●● diff \| view \| raw \| blame \| history
	exam-system/src/main/java/com/gkhy/exam/pay/service/NonCoalPayStudentService.java	4 ●●●●● diff \| view \| raw \| blame \| history
	exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayStudentServiceImpl.java	49 ●●●●● diff \| view \| raw \| blame \| history
	exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml	10 ●●●●● diff \| view \| raw \| blame \| history
	exam-system/src/main/resources/mapper/pay/NonCoalPayStudentMapper.xml	7 ●●●●● diff \| view \| raw \| blame \| history
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java	102 ●●●●● diff \| view \| raw \| blame \| history
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java	269 ●●●●● diff \| view \| raw \| blame \| history
	ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java	6 ●●●●● diff \| view \| raw \| blame \| history