Merge branch 'api' into hive2.0

jyy

2021-03-09 62b534e96922a3911f61845753ee0d126bafd6e1

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