parent: 04ce01 | patch | commitdiff
wzy
2020-12-26 b026000678b45d14970bca3b8052e377072f4af2
refs
author wzy <wzy19931122ai@163.com>
Saturday, December 26, 2020 23:10 +0800
committer wzy <wzy19931122ai@163.com>
Saturday, December 26, 2020 23:10 +0800
commitb026000678b45d14970bca3b8052e377072f4af2
tree 786353c3c757940d94003ac7e1606563d859f235 tree | zip | gz
parent 04ce01155d1218e7318afa9eb562cd2691b60539 view | diff
2cf928a22b6cf8ea7a29f29127ffc333c73b0bca view | diff 
Merge branch 'ty_urgent' into test
9 files modified
1 files added
99 ■■■■■ 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/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