forked from moral

parent: 776f20 | patch | commitdiff
cjl
2023-10-25 04051af6a3115d73dab6935d06ebd70334484962
refs
author cjl <276999030@qq.com>
Wednesday, October 25, 2023 14:37 +0800
committer cjl <276999030@qq.com>
Wednesday, October 25, 2023 14:37 +0800
commit04051af6a3115d73dab6935d06ebd70334484962
tree 33b01d0391b4d170b7000360a2b3d994eec1abfc tree | zip | gz
parent 776f2041b5e54486801b15ed8475b4fe448b3354 view | diff
2d6c5b3f4f72ae3ca6ba155ee3b85892c81f2fe0 view | diff 
Merge remote-tracking branch 'origin/cjl' into cjl

# Conflicts:
#	screen-api/src/main/java/com/moral/api/service/SysDictTypeService.java
#	screen-api/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
2 files modified
2 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/service/SysDictTypeService.java 1 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java 1 ●●●●● diff | view | raw | blame | history