parent: c41e8d | patch | commitdiff
姜友瑶
2022-05-17 206b2a8034f066f7f4d08755abfee3f5049d0632
refs
author 姜友瑶 <935090232@qq.com>
Tuesday, May 17, 2022 11:10 +0800
committer 姜友瑶 <935090232@qq.com>
Tuesday, May 17, 2022 11:10 +0800
commit206b2a8034f066f7f4d08755abfee3f5049d0632
tree 7823227bb91c7f64a7a6606bcba95d8d9985ef5c tree | zip | gz
parent c41e8d372cdabbe1fd5973c9322e38a40bfa1a39 view | diff
830b2eb4e8b7eef6e73fe65cde5331d914c28786 view | diff 
Merge branch 'developer' into alpha
2 files added
29 files modified
341 ■■■■■ 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/MoneyCardUseDao.java 3 ●●●●● 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/MoneyCardUseDao.xml 13 ●●●●● 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/main/resources/static/plugin/vue-treeselect/vue-treeselect.min.css 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/static/plugin/vue-treeselect/vue-treeselect.umd.min.js 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/servicceAddForm.html 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateServiceOrderTimeV2.html 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yyServiceAddForm.html 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/products/goods-form.html 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/BizUserToVipInfoTool.java 65 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/JyyTests.java 11 ●●●●● diff | view | raw | blame | history