Merge branch 'dev' into dev-ty1.2

# Conflicts:
#	mhd-modules/mhd-system/src/main/resources/bootstrap.yml

mhd_bms/src/main/java/com/mhd/bms/application/server/billManage/BillManageApplicationService.java

@@ -766,7 +766,7 @@ public class BillManageApplicationService {
     }
 
     public List<NcLog> getNcLog(Long id, Long type) {
-        return ncLogMapper.selectList(new LambdaQueryWrapper<NcLog>().eq(NcLog::getOrderId, id).eq(NcLog::getType, type).orderByDesc(NcLog::getSendTime));
+        return ncLogMapper.selectList(new LambdaQueryWrapper<NcLog>().eq(NcLog::getOrderId, id).eq(NcLog::getType, type).orderByDesc(NcLog::getNcLogId));
     }
 
     /**

mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/mapper/BillManageMapper.java

@@ -45,5 +45,5 @@ public interface BillManageMapper extends BaseMapper<BillManage>
 
     String getOrgCodeNc(@Param("organizationId") Long organizationId);
 
-    Long getShipperId(@Param("userId") Long userId, @Param("organizationId") Long organizationId);
+    Long getShipperId(@Param("userId") Long userId);
 }

mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java

@@ -269,7 +269,7 @@ public class BillManageImpl extends ServiceImpl<BillManageMapper, BillManage> im
                 throw new ServiceException("结算对象未找到!");
             }
             Long settlementEntityId = settlementCustomers.getSettlementEntityId();
-            Long shipperId = billManageMapper.getShipperId(settlementEntityId, organizationId);
+            Long shipperId = billManageMapper.getShipperId(settlementEntityId);
             if (shipperId==null||shipperId==0){
                 throw new ServiceException("结算对象未找到!");
             }
@@ -940,7 +940,7 @@ public class BillManageImpl extends ServiceImpl<BillManageMapper, BillManage> im
                         throw new ServiceException("结算对象未找到!");
                     }
                     Long settlementEntityId = settlementCustomers.getSettlementEntityId();
-                    Long shipperId = billManageMapper.getShipperId(settlementEntityId, organizationId);
+                    Long shipperId = billManageMapper.getShipperId(settlementEntityId);
                     if (shipperId==null||shipperId==0){
                         throw new ServiceException("结算对象未找到!");
                     }

mhd_bms/src/main/resources/mapper/BillManageMapper.xml

@@ -170,7 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getShipperId" resultType="java.lang.Long">
-        SELECT SHIPPER_ID FROM NGWL_TEST_USER."USER_SHIPPER" where DEL_FLAG = '1' and user_id = #{userId} and organization_id = #{organizationId} limit 1
+        SELECT SHIPPER_ID FROM NGWL_TEST_USER."USER_SHIPPER" where DEL_FLAG = '1' and user_id = #{userId} limit 1
     </select>
 
 </mapper>