parent: dc1a46 | patch | commitdiff
jyy
2021-01-25 4ade37283f06a39057992828e13058ef804ae606
refs
author jyy <935090232@qq.com>
Monday, January 25, 2021 16:35 +0800
committer jyy <935090232@qq.com>
Monday, January 25, 2021 16:35 +0800
commit4ade37283f06a39057992828e13058ef804ae606
tree 136baae451643a6b826421f9088894f48c4c4685 tree | zip | gz
parent dc1a4670261bc852f643d19a83ffc53eeac1b902 view | diff
82b025d6455e550bc4f86668d3729f1c32aee65b view | diff 
Merge remote-tracking branch 'origin/api' into api
7 files modified
58 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/hive/action/SysVipLabelController.java 16 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipLabelDao.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysVipLabelDao.xml 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/operate/label-form.html 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/operate/label-list.html 19 ●●●●● diff | view | raw | blame | history