parent: df67fe | patch | commitdiff
cjl
2023-11-15 f6eada9ffd2fe2b8fdf45e2cc51d4290704ab24a
refs
author cjl <276999030@qq.com>
Wednesday, November 15, 2023 14:24 +0800
committer cjl <276999030@qq.com>
Wednesday, November 15, 2023 14:24 +0800
commitf6eada9ffd2fe2b8fdf45e2cc51d4290704ab24a
tree 3fa7292bb860288be36a5922acc964332490dd50 tree | zip | gz
parent df67fe187fae9ce9f486ea2f14c95a14d843e4a1 view | diff
926dcfa888dd5dd57d357ae1fdcd1f1447434ff4 view | diff 
Merge remote-tracking branch 'origin/dev' into cjl
1 files added
7 files modified
82 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/controller/DictController.java 1 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/entity/Allocation.java 4 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/enums/EmphasisEnum.java 53 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationAddCond.java 4 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationUpdateCond.java 4 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/vo/DictionaryVo.java 5 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java 8 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/AllocationMapper.xml 3 ●●●●● diff | view | raw | blame | history