Merge branch 'master' of http://192.168.0.105:10010/r/jfptManager

nnnjjj123

2021-01-11 b6ebb7d8e25fa5505494204abbc54da849ca548e

 src/main/java/org/springblade/modules/catalog/service/catalogService.java

@@ -34,7 +34,7 @@
 */
public interface catalogService extends IService<catalog> {
   List<Map<String, Object>> selectCatalogList();
   String selectCatalogEqNUmber(String pid);
   List<Map<String, Object>> selectCatalogEqNUmber(String pid);
   List<Map<String, Object>> selectCount();
   List<Map<String, Object>> selectAddvcd();
   List<Map<String, Object>> selectEq();