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

jyy

2021-03-16 72396cbbb60d0418dd4cb63f310532fc70a28c10

 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";