Merge branch 'api' into hive2.0

Helius

2021-01-28 f935e297274e5e75b5c16be62d14b000007ef832

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