Merge remote-tracking branch 'origin/developerF' into developer

# Conflicts:
#	src/main/resources/mapper/AuthProductMapper.xml

src/main/java/com/caimei/service/auth/impl/AuthProductServiceImpl.java

@@ -972,7 +972,7 @@ public class AuthProductServiceImpl implements AuthProductService {
     public ResponseJson<List<ProductListVo>> getSnCodeList(Integer authUserId, Integer authId, Integer downStatus, String productName, String sncode, String authParty) {
         List<ProductListVo> snCodeList = new ArrayList<>();
         List<Integer> liallSn = authProductMapper.getAllSn(authId);
-        List<String> allSnlist = authProductMapper.getAllSnlist(liallSn);
+        List<String> allSnlist =liallSn.size()==0?null: authProductMapper.getAllSnlist(liallSn);
         //判断机构筛选下拉框 0全部，1与其他机构关联
         if (1 == downStatus) {
             //判断该机构是否与其他机构关联

src/main/resources/config/dev/application-dev.yml

@@ -32,10 +32,10 @@ spring:
   #数据源连接--end
 
   redis:
-    host: 192.168.2.100
-    # host: 47.119.112.46
+#    host: 192.168.2.100
+    host: 47.119.112.46
     port: 6379
-    # password: 6#xsI%b4o@5c3RoE
+    password: 6#xsI%b4o@5c3RoE
     #Redis数据库索引（默认为0）
     database: 0
     #连接池最大连接数（使用负值表示没有限制）
@@ -61,7 +61,7 @@ spring:
 logging:
   level:
     root: info
-    com.caimei.mapper: debug
+    com.caimei.mapper.*: debug
     com.caimei.module.product.dao: debug
 
 # swagger文档显示配置
@@ -71,7 +71,7 @@ swagger:
 # 新旧www服务域名
 caimei:
   oldapi: http://192.168.2.81:8009
-  zplmapi: http://192.168.2.200:8012
+  zplmapi: http://192.168.2.103:8012
   zpapi: https://192.168.2.81:8009
   #图片服务器
   imageDomain: http://192.168.2.100

src/main/resources/mapper/AuthProductMapper.xml

@@ -529,7 +529,7 @@
                 #{reId,jdbcType=VARCHAR}
             </foreach>
         </if>
-        GROUP BY p.id
+        group by p.id
     </select>
     <select id="getProductClubList" resultType="com.caimei.model.vo.WxClubListVo">
         select a.id as authId, a.authParty, a.logo