parent: 7208ff | patch | commitdiff
Helius
2021-06-23 4cb590cfe7bc615207bd7fdfcf30295a038e470e
refs
author Helius <wangdoubleone@gmail.com>
Wednesday, June 23, 2021 11:16 +0800
committer Helius <wangdoubleone@gmail.com>
Wednesday, June 23, 2021 11:16 +0800
commit4cb590cfe7bc615207bd7fdfcf30295a038e470e
tree 716de346a7ff9905eb0c2373a32bd21b1b1e7ed5 tree | zip | gz
parent 7208ffbeaeafb9af8d822ef73a51e477e1da4e1f view | diff
756e16e090b15c7fd8648f55f5451367face6abc view | diff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
16 files modified
213 ■■■■■ changed files
zq-erp/pom.xml 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java 17 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/plugin/util/MoneyUtil.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java 32 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java 65 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/prd/application.properties 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-list-new.html 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html 34 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java 8 ●●●●● diff | view | raw | blame | history