parent: 19236d | patch | commitdiff
jyy
2021-04-07 5394194396290aa232910a571d6f4ef463a92a6b
refs
author jyy <935090232@qq.com>
Wednesday, April 7, 2021 11:23 +0800
committer jyy <935090232@qq.com>
Wednesday, April 7, 2021 11:23 +0800
commit5394194396290aa232910a571d6f4ef463a92a6b
tree 9db302ec89c3780733a0e715cd07903e8459f117 tree | zip | gz
parent 19236dc4ae7f18096a09576210929e535de0d482 view | diff
382c853bb36bc2521818058c788b6fdf48d7f684 view | diff 
Merge remote-tracking branch 'origin/score_shop' into score_shop
14 files modified
4 files added
597 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignAwardSetDao.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignRecordDao.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignAwardSet.java 41 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignReceiveRecord.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/service/impl/InitBusParameterSettingService.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/score/action/ScoreRuleSettingAction.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/score/constant/ScoreSettingConstant.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java 154 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/dto/ClickSignDTO.java 17 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/ActivitySignAwardSetVo.java 174 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignBasicInfoJsonVo.java 31 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignBasicInfoVo.java 33 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopActivitiesDao.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/db/increment/签到活动.sql 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignAwardSetDao.xml 67 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignRecordDao.xml 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/score/score-setting.html 21 ●●●●● diff | view | raw | blame | history