Merge branch 'master_0929' into master_after20

-alter table base_data_customer modify column mnemonic_code varchar(20) null;
+alter table base_data_customer modify column mnemonic_code varchar(100) null;
+
+ALTER TABLE base_data_customer
+    MODIFY COLUMN `code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '编号',
+    MODIFY COLUMN `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '名称',
 
 
 -- 厂房信息
 -- 厂房信息
 create table if not exists base_data_workshop (
 create table if not exists base_data_workshop (

@@ -162,11 +162,14 @@ public class ContractDistributorStandardServiceImpl extends
         return getBaseMapper().query(vo);
         return getBaseMapper().query(vo);
     }
     }
 
 
-    @Cacheable(value = ContractDistributorStandard.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null")
     @Override
     @Override
     public ContractDistributorStandard findById(String id) {
     public ContractDistributorStandard findById(String id) {
 
 
         ContractDistributorStandard data = getBaseMapper().selectById(id);
         ContractDistributorStandard data = getBaseMapper().selectById(id);
+        if (data == null) {
+            return null;
+        }
+
         // 获取当前人员的待办任务数据
         // 获取当前人员的待办任务数据
         List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
         List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
         if (CollectionUtils.isEmpty(flowTaskList)) {
         if (CollectionUtils.isEmpty(flowTaskList)) {