parent: abed1e | patch | commitdiff
Helius
2021-04-15 9434605b2a844d3efa511415b15a43c44f21755b
refs
author Helius <wangdoubleone@gmail.com>
Thursday, April 15, 2021 19:41 +0800
committer Helius <wangdoubleone@gmail.com>
Thursday, April 15, 2021 19:41 +0800
commit9434605b2a844d3efa511415b15a43c44f21755b
tree 3875d9c0f648bdbebb1587590a818ec1f651c9de tree | zip | gz
parent abed1e1b52663b539ce88e613051cbab389b0f8a view | diff
bb5be7a8a6ac24fbf66f03f070751577b87c95ca view | diff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
8 files modified
45 ■■■■■ changed files
zq-erp/src/main/resources/config/application.properties 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductCommentDao.xml 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html 15 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/index.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/index.html 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/common/login.html 6 ●●●●● diff | view | raw | blame | history