Merge remote-tracking branch 'origin/score_shop' into score_shop

xiaoyong931011

2021-03-12 6d47ae98e2cc860299bfb976bec226d99a0bcd1b

 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