Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into saas

mec-biz/src/main/java/com/ym/mec/biz/dal/vo/TenantInfoInfoPageVo.java

@@ -48,7 +48,7 @@ public class TenantInfoInfoPageVo implements Serializable {
     @ApiModelProperty(value = "学员上限")
     private Integer studentUpLimit;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "到期时间")
     private Date expireDate;
 

mec-biz/src/main/resources/config/mybatis/TenantInfoMapper.xml

@@ -91,10 +91,10 @@
                 AND a.`state_` = #{param.state}
             </if>
             <if test="param.startDate != null">
-                AND a.`created_time_` <![CDATA[ >= ]]>  #{param.startDate}
+                AND b.`expiry_date_` <![CDATA[ >= ]]>  #{param.startDate}
             </if>
             <if test="param.endDate != null ">
-                AND a.`created_time_` <![CDATA[ <= ]]>  #{param.endDate}
+                AND b.`expiry_date_` <![CDATA[ <= ]]>  #{param.endDate}
             </if>
         </where>
     </select>

mec-common/common-core/src/main/java/com/ym/mec/common/page/WrapperUtil.java

@@ -218,8 +218,7 @@ public class WrapperUtil<T> {
      */
     public static <O> void listDifference(List<O> a, List<O> b) {
         //将ab并集
-        Collection abUn = CollectionUtils.retainAll(a, b);
-        System.out.println(abUn);
+        Collection<O> abUn = CollectionUtils.retainAll(a, b);
         //删除a中abUn的值
         a.removeAll(abUn);
         //删除b中abUn的值