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

zhengyiming

4 天以前 3d65c4337d144d9d83e37bc52cd2bf59ceab3e85

 src/views/TaskManage/components/TaskDetailView.vue

@@ -47,7 +47,7 @@
              </ProFormItemV2>
            </ProFormColItem>
          </ProFormCol>
          <template v-if="form.billingMethod === EnumBillingMethod.Hour">
          <template v-if="form.billingMethod === EnumBillingMethod.Day">
            <ProFormCol>
              <ProFormColItem :span="12">
                <ProFormItemV2 label="核定工时:" prop="verifyWorkHours">