Merge branch 'master' into develop

zenglf

2023-09-28 8e75a78f55d60565eb48b25eafd4eb07939ce2cc

 src/views/mdc/base/modules/shift/ShiftInfoModel.vue

@@ -247,6 +247,7 @@
                  message:'消息',
                  description:"保存失败！"
                });
                that.confirmLoading = false
                that.close()
              }else{
                formData.shiftSubStatus = 1