parent: f9fab7 | patch | commitdiff
xiaoyong931011
2021-03-16 c45db552e4593987248b7833fbe4985b6d80542d
refs
author xiaoyong931011 <15274802129@163.com>
Tuesday, March 16, 2021 17:09 +0800
committer xiaoyong931011 <15274802129@163.com>
Tuesday, March 16, 2021 17:09 +0800
commitc45db552e4593987248b7833fbe4985b6d80542d
tree 8d5d51abbb11d168b50440b856793a8862a8e1d3 tree | zip | gz
parent f9fab7b4d668a5f77136d18f0fc7314b763206eb view | diff
d19501aebadf4c61a1727178b943e362a18c82f6 view | diff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
1 files renamed
6 files modified
3 files added
290 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/biz/action/BizUserAction.java 15 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/core/pojo/VerificationResult.java 47 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/constant/FenxiaoSettingConstant.java 16 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java 71 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java 14 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java 40 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopOrderDao.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopOrderDaoV2.java 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDaoV2.xml 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/shop/shopUser-list.html 60 ●●●●● diff | view | raw | blame | history