姜友瑶
2022-05-17 830b2eb4e8b7eef6e73fe65cde5331d914c28786
refs
author 姜友瑶 <935090232@qq.com>
Tuesday, May 17, 2022 11:08 +0800
committer 姜友瑶 <935090232@qq.com>
Tuesday, May 17, 2022 11:08 +0800
commit830b2eb4e8b7eef6e73fe65cde5331d914c28786
tree 8432e443a7664f6a0ecc908ffc1f56d174e13245 tree | zip | gz
parent 04d51637d3349a7bd92210a5593ebc792c72124a view | diff
781fb421fdda4aff90394777b31aea7664cc6e23 view | diff
Merge remote-tracking branch 'origin/score_shop' into developer
22 files modified
286 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java 12 ●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/SysVipInfoService.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysGoodsServiceImpl.java 7 ●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java 9 ●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml 2 ●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml 4 ●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/common/OperstionLogDao.xml 2 ●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml 32 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/MyBeauticianCountDao.xml 2 ●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/ServicesFlowDao.xml 14 ●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml 2 ●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysFollowupDao.xml 2 ●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml 4 ●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml 17 ●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml 67 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupJoinDao.xml 8 ●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesSeckillRecordDao.xml 4 ●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductCommentDao.xml 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/BizUserToVipInfoTool.java 65 ●●●●● diff | view | raw | blame | history