Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/qo/DownloadReportQO.java

@@ -27,7 +27,7 @@ public class DownloadReportQO extends PageQO {
     @Min(value = 0, message = "不存在该状态", groups = SelectValidView.class)
     @Max(value = 5, message = "不存在该状态", groups = SelectValidView.class)
     private Integer downloadReportStatus;
-    @Min(value = 1, message = "不存在该查询项", groups = SelectValidView.class)
+//    @Min(value = 1, message = "不存在该查询项", groups = SelectValidView.class)
 //    @Max(value = 3, message = "不存在该查询项", groups = SelectValidView.class)
 //    private Integer searchType;
     private String searchValue;

gic-platform-enterprise-service/src/main/resources/mapper/TabBillingSmsRecordMapper.xml

@@ -396,7 +396,7 @@
         and app_code = #{appCode}
       </if>
       <if test="smsContent != null and smsContent != '' ">
-        and sms_content like concat('%', #{smsContent}, '%')
+        and (sms_content like concat('%', #{smsContent}, '%') or receive_phone like concat('%', #{smsContent}, '%') )
       </if>
     </where>
     order by create_time desc