Browse Source

Merge pull request #6487 in DESIGN/design from release/11.0 to feature/x

* commit '846fdc63efc742e9afdf2f1bd38667cb91a66f41':
  REPORT-61606 pc自适应属性中“决策报表”文案修改
feature/x
superman 3 years ago
parent
commit
912c384497
  1. 2
      designer-base/src/main/java/com/fr/design/report/fit/AdaptiveFrmFitAttrModel.java
  2. 2
      designer-base/src/main/java/com/fr/design/report/fit/FrmFitAttrModel.java

2
designer-base/src/main/java/com/fr/design/report/fit/AdaptiveFrmFitAttrModel.java

@ -26,7 +26,7 @@ public class AdaptiveFrmFitAttrModel extends AbstractFitAttrModelProvider {
@Override @Override
public String getModelName() { public String getModelName() {
return Toolkit.i18nText("Fine-Design_New_Decision_Report"); return Toolkit.i18nText("Fine-Design_Basic_Decision_Report");
} }
@Override @Override

2
designer-base/src/main/java/com/fr/design/report/fit/FrmFitAttrModel.java

@ -12,7 +12,7 @@ public class FrmFitAttrModel implements FitAttrModel {
@Override @Override
public String getModelName() { public String getModelName() {
return Toolkit.i18nText("Fine-Design_Basic_Decision_Report"); return Toolkit.i18nText("Fine-Design_Old_Decision_Report");
} }
@Override @Override

Loading…
Cancel
Save