parent: 58aa95 | patch | commitdiff
jyy
2021-01-25 be98bd60f3332f4960d8a5a27778e2d6c2cdcb7f
refs
author jyy <935090232@qq.com>
Monday, January 25, 2021 15:39 +0800
committer jyy <935090232@qq.com>
Monday, January 25, 2021 15:39 +0800
commitbe98bd60f3332f4960d8a5a27778e2d6c2cdcb7f
tree 1c7d355f02a75f10b0dd29985cfc61b4e24f6850 tree | zip | gz
parent 58aa9500960dbfc2d0314864b946364591262686 view | diff
9e6d975a3acabb456be8615894af00ddac0ef4b6 view | diff 
Merge remote-tracking branch 'origin/api' into hive2.0

# Conflicts:
#	zq-erp/src/main/resources/config/application.properties
14 files modified
2 files added
525 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/SysVipLabelController.java 53 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/SysVipLabel.java 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipLabelDao.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpOrderController.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application.properties 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysVipLabelDao.xml 77 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html 141 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/operate/label-form.html 59 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/operate/label-list.html 131 ●●●●● diff | view | raw | blame | history