parent: 47f0d9 | patch | commitdiff
xiaoyong931011
2021-03-12 6d47ae98e2cc860299bfb976bec226d99a0bcd1b
refs
author xiaoyong931011 <15274802129@163.com>
Friday, March 12, 2021 11:42 +0800
committer xiaoyong931011 <15274802129@163.com>
Friday, March 12, 2021 11:42 +0800
commit6d47ae98e2cc860299bfb976bec226d99a0bcd1b
tree f178256f18b1279fe0ac75c2285b39ae7113951a tree | zip | gz
parent 47f0d9fe4cac4f0eccbb26aa6b7a4903d1749d43 view | diff
dcd1bf2779233eabc8ce4c7d2be825c661d9c93d view | diff 
Merge remote-tracking branch 'origin/score_shop' into score_shop
35 files modified
2 files added
1583 ■■■■■ changed files
zq-erp/pom.xml 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/TestClass.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java 54 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java 19 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java 106 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java 80 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderItem.java 32 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/SysProjServicesDao.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java 22 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java 193 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java 35 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java 51 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopProduct.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/db/increment/美度业绩升级.sql 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml 133 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml 18 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml 25 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/TjVipSumDao.xml 52 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/readme-jyy 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/static/templates/vipInfoImport.xls diff | view | raw | blame | history
zq-erp/src/main/resources/static/templates/vipProjUse.xls diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html 158 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-list-new.html 101 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html 199 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html 150 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form.html 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html 24 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html 36 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/SourceFlowTests.java 2 ●●●●● diff | view | raw | blame | history