Merge branch 'v21.1_jianzhuang_20240807' into test

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildVO.java

@@ -272,6 +272,9 @@ public class OrderChildVO {
     @ApiModelProperty(value = "监装联系人电话")
     private String superviseMobile;
 
+    @ApiModelProperty(value = "是否解除监装限制 0 未解除 1 解除")
+    private Integer removeLoadLimitStatus;
+
 
     @ApiModelProperty(value = "发货地采样照片")
     public List<String> getSendSamplingPicList() {

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -3318,7 +3318,6 @@ public class OrderChildServiceImpl implements OrderChildService {
             if (distance > driverNoticeConfigVO.getNoticeTriggerDistanceMeter()) {
                 if (Objects.equals(child.getExitNoticeStatus(), OrderChildEnum.ExitNoticeStatus.NOT_NOTIFIED.getCode())
                 ) {
-                    // todo :jiangwujie 增加短信次数限制
                     //超出货源地x公里范围了,且通知状态为未通知
                     // 到达货源地
                     if (Objects.equals(child.getStatus(), OrderChildEnum.Status.ARRIVE_SEND.getCode())) {

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderChildSqlProvider.java

@@ -185,7 +185,7 @@ public class OrderChildSqlProvider {
                     "send_address, receive_address, " +
                     "driver_user_no, driver_name, driver_mobile, " +
                     "truck_no, unload_pound_no, weight, " +
-                    "cancel_remark, pound_status, status, " +
+                    "cancel_remark, pound_status, status, remove_load_limit_status, " +
                     "DATE_FORMAT(load_deadline, '%Y-%m-%d %H:%i:%s') AS loadDeadline, " +
                     "DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') AS createTime, " +
                     "DATE_FORMAT(unload_time, '%Y-%m-%d %H:%i:%s') AS unloadTime ");