Merge branch 'release/2.10.1.2402.01' into release/2.10.1.2402.01-个税
This commit is contained in:
commit
c8406c34e0
|
|
@ -106,7 +106,7 @@ class TemplateBaseSettings extends Component {
|
||||||
render() {
|
render() {
|
||||||
const { watermarkStatus, watermark, watermarkSet, ackFeedbackSetting, salaryBillViewingLimitSetting } = this.state;
|
const { watermarkStatus, watermark, watermarkSet, ackFeedbackSetting, salaryBillViewingLimitSetting } = this.state;
|
||||||
const { ackStatus, feedbackStatus, autoAckDays, feedBackUrl, mobileFeedbackUrl } = ackFeedbackSetting;
|
const { ackStatus, feedbackStatus, autoAckDays, feedBackUrl, mobileFeedbackUrl } = ackFeedbackSetting;
|
||||||
const { limitMonth = 0 } = salaryBillViewingLimitSetting;
|
const { limitMonth } = salaryBillViewingLimitSetting;
|
||||||
return (
|
return (
|
||||||
<React.Fragment>
|
<React.Fragment>
|
||||||
<WeaSearchGroup title={getLabel(111, "水印设置")} showGroup needTigger className="waterMarkWrapper">
|
<WeaSearchGroup title={getLabel(111, "水印设置")} showGroup needTigger className="waterMarkWrapper">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue