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

jyy

2021-03-12 b12efd16399d217756bf71b92d88b29bd4781295

 zq-erp/src/main/java/com/matrix/system/hive/action/ProjTypeController.java

@@ -25,13 +25,8 @@
@RequestMapping(value = "/admin/projtype")
public class ProjTypeController extends BaseController {
 
 
   @Resource
   private SysProjTypeService currentService;




   
   public static final String fnCode = "projType";
   public static final String search = fnCode + ":search";