Merge branch 'dev_plugins' into dev_temp

epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java

@@ -57,7 +57,7 @@ public interface OperCrmOpenFeignClient {
 	Result addManager(@RequestBody CustomerManagerFormDTO form);
 
 	/**
-	 * 获取客户李彪
+	 * 获取客户列表
 	 * @author zhaoqifeng
 	 * @date 2020/8/3 15:24
 	 * @return com.epmet.commons.tools.utils.Result

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionDetailDao.xml

@@ -63,7 +63,7 @@
             fc.customized_name AS "customizedName",
             fc.from_app AS "fromApp",
             fc.icon_large_img AS "defaultLargeImg",
-            fc.icon_small_img AS "defaultSmallImg ",
+            fc.icon_small_img AS "defaultSmallImg",
             f.function_explain AS "functionExplain"
         FROM
             customer_function_detail cfd