Merge remote-tracking branch 'origin/dev' into dev

2026-01-19 15:32:30 +08:00
parent 7f8732dd02 56356839bf
commit aab59723f9
168 changed files with 16931 additions and 13 deletions
@@ -8,6 +8,7 @@ import com.mhd.basic.domain.serviceItemsManage.repository.todo.ServiceItemsManag
 import com.mhd.basic.interfaces.assember.serviceItemsManage.ServiceItemsManageAssembler;
 import com.mhd.basic.interfaces.dto.serviceItemsManage.ServiceItemsManageDTO;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

@@ -40,6 +41,12 @@ public class ServiceItemsManageApi extends BaseController{
    {
        //转换实体
        ServiceItemsManageDO serviceItemsManageDO = serviceItemsManageAssembler.toDO(serviceItemsManageDTO);
+        if(StringUtils.isBlank(serviceItemsManageDTO.getCreateByName())){
+            serviceItemsManageDO.setCreateByName(null);
+        }
+        if(StringUtils.isBlank(serviceItemsManageDTO.getUpdateByName())){
+            serviceItemsManageDO.setUpdateByName(null);
+        }
        startPage();
        List<ServiceItemsManagePO> list = serviceItemsManageApplicationService.queryList(serviceItemsManageDO);
        return getDataTable(list);
@@ -14,6 +14,7 @@ spring:
    nacos:
      discovery:
 #        server-addr: 127.0.0.1:8848
+#        server-addr: 10.33.0.129:6010
        # 线上测试环境配置 容器名+端口号
        server-addr: 10.102.192.5:6848
        username: nacos
@@ -22,6 +23,7 @@ spring:
 #        server-addr: 10.102.192.105:6848
      config:
 #        server-addr: 127.0.0.1:8848
+#        server-addr: 10.33.0.129:6010
        # 线上测试环境配置 容器名+端口号
        server-addr: 10.102.192.5:6848
        username: nacos