parent: 2930c0 | patch | commitdiff
jyy
2021-04-15 bb5be7a8a6ac24fbf66f03f070751577b87c95ca
refs
author jyy <935090232@qq.com>
Thursday, April 15, 2021 17:56 +0800
committer jyy <935090232@qq.com>
Thursday, April 15, 2021 17:56 +0800
commitbb5be7a8a6ac24fbf66f03f070751577b87c95ca
tree 63fc0706e96311321d7c99cbc40ef05c0f430e82 tree | zip | gz
parent 2930c0767960ab50d8cb08c5eaab63590ce8b49e view | diff
112473768acb75b2f9bd7eca3da035ed624e5123 view | diff 
Merge remote-tracking branch 'origin/score_shop' into score_shop
13 files modified
130 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/weixinUtil/WeixinServiceUtil.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/actions/BusParameterSettingsAction.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/SysProjServicesService.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java 47 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hiveErp/action/DataAnalysisCustomer.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShareProductAction.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java 23 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml 21 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html 15 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html 5 ●●●●● diff | view | raw | blame | history