parent: 377151 | patch | commitdiff
jinpengyong
2023-11-15 84e740f362d574b942b1c9a274425841c9167de8
refs
author jinpengyong <jpy123456>
Wednesday, November 15, 2023 08:27 +0800
committer jinpengyong <jpy123456>
Wednesday, November 15, 2023 08:27 +0800
commit84e740f362d574b942b1c9a274425841c9167de8
tree 0f4dccd5e9a415ef2f6816c4a15e5e33327cc42d tree | zip | gz
parent 3771512ff8b1f4bd6c40cdcdff58b3a64cee78b1 view | diff
be8a4a6f82bd32dc5a3cf2e038848012f336f644 view | diff 
Merge remote-tracking branch 'origin/wb' into qa
1 files added
7 files modified
78 ■■■■■ 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 54 ●●●●● 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 3 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/AllocationMapper.xml 3 ●●●●● diff | view | raw | blame | history