Merge branch 'score_shop' into api_score_meger

Helius

2021-04-21 4cab5d1219c7ea01e60a0629bf0e9e062be029d1

 zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java

@@ -33,6 +33,7 @@
 */
@RequestMapping(value = "/common")
@Controller
@CrossOrigin(origins = "*", maxAge = 3600)
public class CommonAction extends BaseAction {

   @Autowired