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

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/DataWechatMemberConfigServiceImpl.java

@@ -29,6 +29,7 @@ public class DataWechatMemberConfigServiceImpl implements DataWechatMemberConfig
         dto.setUpdateTime(now);
         dto.setStatus(1);
         TabDataWechatMemberConfig record = EntityUtil.changeEntityNew(TabDataWechatMemberConfig.class, dto);
+        record.setDeleteFlag(0);
         tabDataWechatMemberConfigMapper.insert(record);
         return record.getWechatMemberConfigId();
     }