parent: 1626ac | patch | commitdiff
xiaoyong931011
2021-04-06 162fd6cf9cc47858c29d0b488bd7f018b77a56b4
refs
author xiaoyong931011 <15274802129@163.com>
Tuesday, April 6, 2021 11:29 +0800
committer xiaoyong931011 <15274802129@163.com>
Tuesday, April 6, 2021 11:29 +0800
commit162fd6cf9cc47858c29d0b488bd7f018b77a56b4
tree 2f512b5484f08e7fed0feb75aa987106811887c4 tree | zip | gz
parent 1626acc411e92b8971c482460b6514e881b9f313 view | diff
abe25c659140b8c3f4db90ce943f4143a7d7f40f view | diff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
8 files modified
100 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/SysVipInfo.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShareProductAction.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopShareQrcord.java 69 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/static/js/function/vip.js 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html 2 ●●●●● diff | view | raw | blame | history