parent: e63d04 | patch | commitdiff
jyy
2021-04-07 2a4dc73c59eae1e14b0e0660bf04652fa3d322ad
refs
author jyy <935090232@qq.com>
Wednesday, April 7, 2021 12:06 +0800
committer jyy <935090232@qq.com>
Wednesday, April 7, 2021 12:06 +0800
commit2a4dc73c59eae1e14b0e0660bf04652fa3d322ad
tree f88cae65ca96629169834c9663bdd07553263704 tree | zip | gz
parent e63d043f012ef050738c01082ef5cbfd1f0abbbc view | diff
050ff0dfc04d4ca2a33ac0e97c98f042b9f95df6 view | diff 
Merge remote-tracking branch 'origin/score_shop' into score_shop
3 files modified
183 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopActivitiesAction.java 40 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-list.html 142 ●●●●● diff | view | raw | blame | history