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

jyy

2021-01-28 83571cf68bc955b8b804d3402331d1ba7f2f4e6c

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