Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 f84d9e69907cb678150eaa6393fd74cf042fcca4

1
2
3
4
5
        validatorRules: {
<#list sub.colums as po>
  <#include "core.ftl">
</#list>
        },