Merge branch 'ruansiyuan' into 'master'

修改下sql

See merge request rays/pcloud-book!102

pcloud-service-book/src/main/java/com/pcloud/book/group/dao/impl/WeixinQrcodeDaoImpl.java

@@ -28,7 +28,7 @@ public class WeixinQrcodeDaoImpl extends BaseDaoImpl<WeixinQrcode> implements We
     public WeixinQrcodeDTO getOneWechatGroup(Integer generation) {
         Map<String, Object> paramMap = new HashMap();
         paramMap.put("generation", generation);
-        return this.getSqlSession().selectOne(this.getStatement("getOneWechatGroup"));
+        return this.getSqlSession().selectOne(this.getStatement("getOneWechatGroup"),paramMap);
     }
 
     @Override

pcloud-service-book/src/main/resources/mapper/group/WeixinQrcode.Mapper.xml

@@ -32,7 +32,7 @@
         VALUES (#{qrcodeUrl,jdbcType=VARCHAR},#{weixinGroupId,jdbcType=VARCHAR}, #{robotId,jdbcType=BIGINT},#{robotWxId,jdbcType=VARCHAR},#{updateState},#{createUser}, NOW(),now(), #{generation})
     </insert>
 
-    <select id="getOneWechatGroup" resultType = "WeixinQrcodeDTO" >
+    <select id="getOneWechatGroup" resultType = "WeixinQrcodeDTO" parameterType="map" >
         SELECT id, qrcode_url qrcodeUrl, weixin_group_id weixinGroupId, robot_id robotId, robot_wx_id robotWxId
         FROM weixin_qrcode
         WHERE use_state = 0  AND update_state in (0,1,3) and weixin_group_id != ''