parent: 04ce01 | patch | commitdiff
Helius
2020-12-27 862f4f0942da8033bf49af89eca0055ad8cb4730
refs
author Helius <wangdoubleone@gmail.com>
Sunday, December 27, 2020 12:26 +0800
committer Helius <wangdoubleone@gmail.com>
Sunday, December 27, 2020 12:26 +0800
commit862f4f0942da8033bf49af89eca0055ad8cb4730
tree 9066c2daeb24f34ba84afc5faa50a7c9665349b1 tree | zip | gz
parent 04ce01155d1218e7318afa9eb562cd2691b60539 view | diff
8eda088db63ff198cbcd51bf0599531ed006cb84 view | diff 
Merge branch 'ty_urgent' into test
10 files modified
1 files added
103 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/hive/dao/MoneyCardUseDao.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/SysProjUseDao.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/job/InvalidTimeJob.java 48 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml 22 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseDao.xml 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml 6 ●●●●● 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 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/statistics/custom-consume-list.html 6 ●●●●● diff | view | raw | blame | history