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

jyy

2021-04-21 4dfe83675fc23f4514b6c3cf44fcc84c7e0b52a8

 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