Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化

# Conflicts:
#	jikimo_frontend/static/src/js/custom_form_status_indicator.js

jikimo_frontend/static/src/js/custom_form_status_indicator.js

@@ -83,9 +83,9 @@ patch(FormStatusIndicator.prototype, 'jikimo_frontend.FormStatusIndicator', {
 );
 patch(Field.prototype, 'jikimo_frontend.Field', {
     setup() {
-            owl.onMounted(this.setRequired);
-            return this._super(...arguments);
-        },
+        owl.onMounted(this.setRequired);
+        return this._super(...arguments);
+    },
     setRequired() {
         const id = this.props.id
         const isRequired = filedRequiredList[id]