Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

Helius

2021-03-12 0a16ffd3e627278bc317109ef7102f5673a1242d

 zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopPageAction.java

@@ -27,7 +27,7 @@

/**
 * @description 小程序页面
 * @author yourName
 * @author jyy
 * @date 2020-04-03 14:56
 */
@Controller