Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into dat...

wzy

2021-04-24 1a20adbee4043a7b4a9e51565e7ac0f99d06c36d

 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